From: Raspbian forward pporter <root@raspbian.org>
Date: Sun, 20 May 2018 21:29:35 +0000 (+0100)
Subject: Merge version 4.1.1-1+rpi1 and 4.1.2-1 to produce 4.1.2-1+rpi1
X-Git-Tag: archive/raspbian/4.1.2-1+rpi1^0
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=2d5cf870a686c7e7ebfcbd1579c2be82053d972a;p=pdns.git

Merge version 4.1.1-1+rpi1 and 4.1.2-1 to produce 4.1.2-1+rpi1
---

2d5cf870a686c7e7ebfcbd1579c2be82053d972a
diff --cc debian/changelog
index 6d43938,74a3a2a..98f10b9
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,16 @@@
- pdns (4.1.1-1+rpi1) buster-staging; urgency=medium
++pdns (4.1.2-1+rpi1) buster-staging; urgency=medium
 +
 +  [changes brought forward from 4.1.0-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 31 Dec 2017 14:27:56 +0000]
 +  * Add -latomic to ldflags.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 22 Feb 2018 00:44:18 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 20 May 2018 21:29:35 +0000
++
+ pdns (4.1.2-1) unstable; urgency=medium
+ 
+   * New upstream version 4.1.2
+   * Includes fix for CVE-2018-1046 in dnsreplay. (Closes: #898255)
+ 
+  -- Chris Hofstaedtler <zeha@debian.org>  Mon, 14 May 2018 11:17:08 +0000
  
  pdns (4.1.1-1) unstable; urgency=medium